From: Rui Matos <tiagomatos@gmail.com>
Date: Mon, 7 Jul 2014 12:30:40 +0000 (+0200)
Subject: ibusCandidatePopup: Fix default candidate index labels
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2355
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=39c210abed3105bf9d79402a451155b4bf6c344a;p=gnome-shell.git

ibusCandidatePopup: Fix default candidate index labels

The first 10 candidates are supposed to be shortcutted with the
keyboard keys 1 through 0 so the 10th index should be '0', not 'a'.

https://bugzilla.gnome.org/show_bug.cgi?id=702944
---

diff --git a/js/ui/ibusCandidatePopup.js b/js/ui/ibusCandidatePopup.js
index ded7cb830..0f7c3b20c 100644
--- a/js/ui/ibusCandidatePopup.js
+++ b/js/ui/ibusCandidatePopup.js
@@ -11,6 +11,9 @@ const Main = imports.ui.main;
 
 const MAX_CANDIDATES_PER_PAGE = 16;
 
+const DEFAULT_INDEX_LABELS = [ '1', '2', '3', '4', '5', '6', '7', '8',
+                               '9', '0', 'a', 'b', 'c', 'd', 'e', 'f' ];
+
 const CandidateArea = new Lang.Class({
     Name: 'CandidateArea',
 
@@ -89,7 +92,7 @@ const CandidateArea = new Lang.Class({
             if (!visible)
                 continue;
 
-            box._indexLabel.text = ((indexes && indexes[i]) ? indexes[i] : '%x'.format(i + 1));
+            box._indexLabel.text = ((indexes && indexes[i]) ? indexes[i] : DEFAULT_INDEX_LABELS[i]);
             box._candidateLabel.text = candidates[i];
         }